From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Aug 2013 15:32:29 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a2125dbbe302d08c182ae8878077e2b288efe4fd;p=emacs.git

merge from trunk
---

a2125dbbe302d08c182ae8878077e2b288efe4fd